Merge from 2.4:

Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>

	Merge from 2.4:

	* gtk/gtkiconfactory.c (icon_source_clear): Don't
	call g_free() on a pixbuf.  (#141961, Crispin Flowerday)

diff --git a/ChangeLog b/ChangeLog
index 0b7dee362473545cc2c0683b0510db162226f0b2..3a0d83f8d46c92c6db7398fb865bb60155d2f1fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * gtk/gtkiconfactory.c (icon_source_clear): Don't
+       call g_free() on a pixbuf.  (#141961, Crispin Flowerday) 
+
 2004-05-05  Matthias Clasen  <mclasen@redhat.com>
    
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0b7dee362473545cc2c0683b0510db162226f0b2..3a0d83f8d46c92c6db7398fb865bb60155d2f1fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * gtk/gtkiconfactory.c (icon_source_clear): Don't
+       call g_free() on a pixbuf.  (#141961, Crispin Flowerday) 
+
 2004-05-05  Matthias Clasen  <mclasen@redhat.com>
    
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0b7dee362473545cc2c0683b0510db162226f0b2..3a0d83f8d46c92c6db7398fb865bb60155d2f1fc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * gtk/gtkiconfactory.c (icon_source_clear): Don't
+       call g_free() on a pixbuf.  (#141961, Crispin Flowerday) 
+
 2004-05-05  Matthias Clasen  <mclasen@redhat.com>
    
        Merge from 2.4:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0b7dee362473545cc2c0683b0510db162226f0b2..3a0d83f8d46c92c6db7398fb865bb60155d2f1fc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed May  5 22:20:21 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Merge from 2.4:
+       
+       * gtk/gtkiconfactory.c (icon_source_clear): Don't
+       call g_free() on a pixbuf.  (#141961, Crispin Flowerday) 
+
 2004-05-05  Matthias Clasen  <mclasen@redhat.com>
    
        Merge from 2.4:

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 37fa891892dfaca4f917638b8672d28035d7dad2..b75db0097f1a9722231bc5becbc10698f338b673 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -2091,7 +2091,8 @@ icon_source_clear (GtkIconSource *source)
     case GTK_ICON_SOURCE_FILENAME:
       g_free (source->source.filename);
       source->source.filename = NULL;
-      g_free (source->filename_pixbuf);
+      if (source->filename_pixbuf) 
+       g_object_unref (source->filename_pixbuf);
       source->filename_pixbuf = NULL;
       break;
     case GTK_ICON_SOURCE_PIXBUF: